Changed the nvcc compilation rule
Changed back from template scale functions
Half-way implementing the curved space Vay pusher