Added try / catch sys.argv[2] and cleaned up source code
Merge branch 'development' of https://github.com/rightlag/boto-scripts into development